Merge "Revert "Add actor attr and QueriesOverlayable styleable"" into rvc-dev am: 0bf55d7d28 am: cc0c490e57 am: 8d7acb098c am: 447941590b

Change-Id: Ife8a408b9647a106859b1e4d4dba211a58693752