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

Change-Id: I5d516b939f8633664a725fe2dc11f065140cf0b8