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