Merge "Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 08da76161c" into rvc-d1-dev-plus-aosp am: 10f73a33a8

Change-Id: Ie1fc5e69fac87b68385cabfe9a55f56c7ac1268d
This commit is contained in:
Automerger Merge Worker
2020-04-02 19:49:04 +00:00

Diff Content Not Available