Merge "Add flag for audio focus to facilitate overlays" am: 06635d0a6c
am: 60def69c26

Change-Id: I91c13e54c54ebdb9b9a91192ee8b74be35227956