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