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

Change-Id: I46789fdfa62337562f3d0c05d0c4e1b7af91a453