tree 01fd32243e3717c09cc784601995712fde19f066
parent 8c2e4c07c63ec03ed1b7c857c541bd624ee6fd35
parent 7b1cfb041923d2b1a81c8e17534a135cbd73e8b3
author Adam Bookatz <bookatz@google.com> 1585860191 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585860191 +0000

Merge "Avoid getUserBadgeNoBackgroundResId if no badge" into rvc-dev am: 2f559add63 am: 81ed507cfe am: cf459fbbb4 am: f894378343 am: 7b1cfb0419

Change-Id: I6c5e0a7c231fa61c3f7ce141d3ddab8ed168e262