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

Merge "Merge "Partial revert "Add overlayable configurator resources" am: 2c206f86 am: 7739e07e" into rvc-d1-dev-plus-aosp am: 3d0afda3" into rvc-qpr-dev-plus-aosp am: c7538d7e

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

Change-Id: I4f3a6f7ccc9fce3e5cd3cdbe3ad56778657626bd