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

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

Change-Id: I75de7430c8bd23d4f3382fa884169a46a68bc459