[automerger skipped] Merge "Revert "Remove unused resources"" into sc-dev am: 18dbe0bba5 -s ours am: 63c62bafbf -s ours am: 8c7ee3daee -s ours am: 7a9014a9df -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
This commit is contained in: