Merge "Update the system-current file for getAudioLocation API" am: 01e0977975 am: c85b7e1513

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

Change-Id: Icf6c65d273f3bd58ee8399eff7050b7af7267afa