[automerger skipped] Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" am: 79490a9c am: a4c475a6 am: 53942e86 -s ours am: 9daf34be -s ours

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

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

Change-Id: I11a4574378c0cbcf197cdc85d27635a9a1a2c8f1