tree 79fea1bfe51ecae616a66e2cc83dc4a20062192f
parent 6ac8410fd3df1fccc4fbd82b14ca9122aecbebd7
parent 2f559add63f0fa0de5be4deb3ffad0bb73ba7e52
author Adam Bookatz <bookatz@google.com> 1585854010 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585854010 +0000

Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63

Change-Id: Ib9cb6eb0e5a1e1d3e913101d545f6fb9ea74ac71