[automerger skipped] Merge "Remove unused resources" into sc-dev am: 2ab64731 am: 44b3f387 -s ours

am skip reason: Merged-In I7f76ca4249431fb226972ed48cc1a4a10328a556 with SHA-1 e4bb3b12 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16213676

Change-Id: Ie05a194619e90dcaad5b892caed85eba92012aae