[automerger skipped] Merge "[Ranging] Add new permission for Android generic...

[automerger skipped] Merge "[Ranging] Add new permission for Android generic ranging feature" into main am: 46c865ab am: 4009d93b -s ours

am skip reason: Merged-In I7a777ec060628fef81983d94dfd6732b97b5a2ed with SHA-1 4f6cb65d is already in history

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



Change-Id: I3968e7945dbb7e4c6d496e0e05128fe18ae8a0f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>