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

Change-Id: Iecb8be029904271b73530e09e4d020a2a3965463