[automerger skipped] Merge "Revert "Remove unused resources"" into sc-dev am: 18dbe0bb -s ours

am skip reason: skipped by user dupin

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

Change-Id: I94b80936df49b498ffc5f1138ebdf125e4281cf1