Merge "[automerger skipped] Merge "Remove unused resources" into sc-dev am:...

Merge "[automerger skipped] Merge "Remove unused resources" into sc-dev am: 2ab64731 -s ours am: c8e63e3b -s ours am: e5bb086c -s ours" into sc-v2-dev-plus-aosp am: 1aa8ab6f -s ours

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

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

Change-Id: I009290bbfd9c00a692e412540902c1b032fb6367