[automerger skipped] Merge "[Ranging] Register ranging service" into main am: fd890dc5bd am: aa08b8ae2b -s ours

am skip reason: Merged-In I17474b9b6395c9ec4d73126db414f41b2ee634af with SHA-1 6a1648d1a9 is already in history

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

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