Merge "Revert "New APIs for immersive audio"" into sc-v2-dev am: c3537ee73a am: 7d1b6c89ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15675639

Change-Id: Ifaf2d777f69f50b04455738a611a6ddac745eb2b