[automerger skipped] Merge "TelephonyRegistry: Pass featureId to...

[automerger skipped] Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" into rvc-qpr-dev am: 1c9ac73a -s ours am: 7c330732 -s ours am: ad53327d -s ours

am skip reason: skip tag Change-Id I3a5afddfc151e06f5deb0220620bbd40849626c4 with SHA-1 923b6d86 is already in history

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

Change-Id: I726086ce3d50f0d077123037b5b5e0388663a3c1