Merge "[automerger skipped] Merge "[TNU07] Remove unused resources" into rvc-dev am: 6be43a347c -s ours am: d82365be36 -s ours" into rvc-d1-dev-plus-aosp am: ad17b0c8bc -s ours am: 619b6c07aa -s ours
am skip reason: Change-Id Ie67f7f4d0863d58c4c5206e445c1dbdfe3f65f60 with SHA-1 aae51894eb is in history
Change-Id: I83a737cce14733b1bec63610e15f7bdd02c56bd3
This commit is contained in: