Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs"