Merge "Revert "New APIs for immersive audio"" into sc-v2-dev am: c3537ee7

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

Change-Id: I0567841a0d6c8380190a99e5a618c93243cedb62