Merge "Revert "Remove unused resources"" into sc-dev am: 18dbe0bba5

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

Change-Id: Ide004e5a9dfa13a0e400529af1eafa9a73a54853