[automerger skipped] Merge "Don't release focus until all audio ops are done"...
[automerger skipped] Merge "Don't release focus until all audio ops are done" am: 5ed51aa8 am: 2e99faf7 -s ours am: 9b168fbd -s ours
am skip reason: Change-Id Ibba6c357c8a308e5883ebd81cb9464b9fec905c7 with SHA-1 c08c76d8 is in history
Change-Id: I81de71bcc5fc5ccd0669417011e9f7526e8be1b7