Revert "Fix the badge in badge (triple badging), by simply remov..."

Revert submission 24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Reason for revert: Breaking tests

Reverted changes: /q/submissionid:24721954-cherrypick-removeBadgeInBadge-dia2ji7r7td

Change-Id: Ia78cbae76d52b52fdfdc258311712f44bd645f2e
1 file changed