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

am skip reason: skipped by user dupin

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

Change-Id: Ie70460c0404330912504fd28c618824764733ae6