[automerger skipped] Merge "Merge "Process focus events first" into rvc-dev...

[automerger skipped] Merge "Merge "Process focus events first" into rvc-dev am: 0b257105 am: cedd7327" into rvc-d1-dev-plus-aosp am: 976d87d6 -s ours am: 068af3a7 -s ours

am skip reason: Change-Id I95256bd3f57988d1990cf1f21267c8f405892e8e with SHA-1 de1bc4a4 is in history

Change-Id: Iac4959ea356dd93393f7f780c3be624e56e31117