Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: e3f702e10c

Change-Id: I347ec9317ddd36d82f9463594ceb022509385aea