Merge "Add new UiModeManger CTS test." am: e8fc4daf79
am: 303c4db0dc

Change-Id: I374d1a54dc1ede398a0bcaa617236c1579b29320