Merge "Partial revert "Add overlayable configurator resources" am: 2c206f86...

Merge "Partial revert "Add overlayable configurator resources" am: 2c206f86 am: 7739e07e am: 9865fa21" into rvc-qpr-dev-plus-aosp am: 436fb367

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

Change-Id: I37995b40642a8b25c61cbafc6efe3e60b12a2326