[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 skip reason: skipped by user dupin

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

Change-Id: If169a96d37224be3b99297ffa2d162ffd0f389d1