[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 skip reason: Change-Id Ibba6c357c8a308e5883ebd81cb9464b9fec905c7 with SHA-1 c08c76d8 is in history
Change-Id: I56f58158647db8b51195fccd2a91970748a974f8