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

Change-Id: I1e0e5b57ff169354c33ac4c22bc5db83d87f19a3