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