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

Change-Id: I32a4a03936f45e00811956e732cd296fe0e655e1