Merge "Add TestApi interfaces for window organizers" into rvc-dev am: 1df5eb01 am: d5c30374 am: 9c88460e Change-Id: I5f705ebc54cc2bfbc2feb6d2131c644cf511cb74