[automerger skipped] Merge "Add new UiModeManger CTS test." am: e8fc4daf79 am: 303c4db0dc
am: 8b9513b1bc -s ours
am skip reason: change_id I84b01c0665508d0cb3555efd91e2ff929a0fd561 with SHA1 893de082f5 is in history

Change-Id: I2cdb1b0a3c7f0181fd7c7581887ffcb7cc5a6a5b