Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" am: dcb8aa7c am: 21984f90 am: 98b09fda Change-Id: I5c67a499fb6d5028cd09bf95c6bcca91018b17ec