Merge "Adding UiModeManager Custom Tests" into rvc-dev am: 09550968fb

Change-Id: I56e9174203a83de0d01382d97af9659002c2b870