Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 4f7fa277ab am: 5c8a0bbc4e

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

Change-Id: Ia4ebf6fe751532c9009b34f0536c2ec9662f146e