Merge "[automerger skipped] Failed UiModeManagerServiceTest am: e6b4c38f90 -s ours am: 7b1e562c62 -s ours" into rvc-dev-plus-aosp