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

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

am skip reason: Merged-In I7f76ca4249431fb226972ed48cc1a4a10328a556 with SHA-1 e4bb3b12 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Id81219d11a1101da0a0f09b9031008d136013106