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

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

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

Change-Id: I09ca04c3fee138b7b240cccdc911e2fe9c04e05f