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

Change-Id: Ic1423e9c6f5ea9f5b07d03de36a63e0de69571c7