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

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

Change-Id: I116e186a347cd1e6e564f146ff6099a410f67629