Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" am: dcb8aa7cba am: 21984f9031 am: 98b09fda03

Change-Id: I5c67a499fb6d5028cd09bf95c6bcca91018b17ec