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

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

am skip reason: skipped by user dupin

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

Change-Id: Iea5664424ac37e735e6edfde0262118441f3ae05