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

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

Change-Id: I1cab8d1e87f82f4c939b5e27803c16369de2c0e6