Merge "[automerger skipped] Failed UiModeManagerServiceTest am: e6b4c38f -s...

Merge "[automerger skipped] Failed UiModeManagerServiceTest am: e6b4c38f -s ours am: 7b1e562c -s ours" into rvc-dev-plus-aosp am: 5bcefb54 -s ours am: ad5608f5 -s ours am: e94cb60d -s ours

am skip reason: Change-Id I09af78fd16662185d01aea427188f79527d47a9e with SHA-1 1b174b0d is in history

Change-Id: Idcf2f70938afb02eece32ba1d4a4cc99da126d2d