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