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

[automerger skipped] Merge "Remove unused resources" into sc-dev am: 2ab64731 -s ours am: c8e63e3b -s ours am: ef1e0cc2 -s ours am: f95ada84 -s ours

am skip reason: skipped by user dupin

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

Change-Id: Ic020226bc040071976d67d0636f105373f1ecd8d