Merge "Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: e3f702e10c am: f5dcdab527 am: 50c0a4619b" into rvc-qpr-dev-plus-aosp am: 30ad7b1b51

Change-Id: Ifcdd23cace8e8a98942d5483a91cfd057832d28b