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

Change-Id: I652c9ab83726f41c5e22b485b1dafe90f264c735