Merge "Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 4f7fa277ab am: b8b8f1323b" into rvc-qpr-dev-plus-aosp am: f31ee636c9

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

Change-Id: I6e8c3a67a6356ea179abd45e49b2725813cbdbdd