Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749ed am: 73a4ff6dd6 am: b378163ae7 am: b123fbbb3b

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

Change-Id: I4a58ff8de55a92ca45e9a006e6eeb3cc6bd5853e