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

Change-Id: Ie1a7e38579c993a4a1f292a2f305121a58f55f30