am f2316a73: am acefecbf: Merge "Updating promise icon\'s bitmap and label when onBadgingChanged is received" into ub-now-porkchop

* commit 'f2316a7386e6fc0c0b5caf6e341876a26c6cddad':