Merge "Add SystemApi to AudioManager method" am: 837956204e am: 8cdb8e97fb

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

Change-Id: I6640b3664adc9cf0480c6aeadbc3983fad7f8950