Merge "TelephonyRegistry: Pass featureId to LocationAccessPolicy" am: 79490a9c00 am: a4c475a6cf

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

Change-Id: Ic7e61bbe59537a7a7023920741e5f30d1f322b3c