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

Change-Id: Id07fd114bbbf27cf2c15cc3d96c2f886dff57fe9