[automerger skipped] Failed UiModeManagerServiceTest am: e6b4c38f90 -s ours am: 7b1e562c62 -s ours am: cbf8b667d4 -s ours am: 12934c948c -s ours
am skip reason: Change-Id I09af78fd16662185d01aea427188f79527d47a9e with SHA-1 1b174b0d31 is in history
Change-Id: Ie78bf145f4bce6c9dcae0ddef37cea90f9115fd9
This commit is contained in: