[automerger skipped] Merge "[TNU07] Remove unused resources" into rvc-dev am: 6be43a347c am: 9320d2ac65 am: 2b1b2d04d3 am: ff478c9d8b -s ours am: 4821a6f018 -s ours
am skip reason: Change-Id Ie67f7f4d0863d58c4c5206e445c1dbdfe3f65f60 with SHA-1 aae51894eb is in history
Change-Id: I8e756d2e272e9d79c35eb792c96d24d051f76c30
This commit is contained in: