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

Change-Id: I673b544952df7ecd7c0e689c9ae48df619304e32