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

Merge "Partial revert "Add overlayable configurator resources" am: 2c206f86 am: f44d8558 am: 5970e820" into rvc-qpr-dev-plus-aosp am: 99c43f31

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

Change-Id: Ifb05a026e42c81357b7de9da08bb1697ede34ad2