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

This commit is contained in:
Automerger Merge Worker
2020-04-02 19:21:40 +00:00
committed by Android (Google) Code Review

Diff Content Not Available