[automerger skipped] Merge "Separate mic + camera from location" into...

[automerger skipped] Merge "Separate mic + camera from location" into rvc-qpr-dev am: 515db303 am: 2e552e36 -s ours

am skip reason: Change-Id I1e7f62d6fccb4a3bc4fdf2a47a8d5c8a4f55421d with SHA-1 2fb81031 is in history

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

Change-Id: I1067f878012f26d7430a9f8193fdc710dd1a3385