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

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

Change-Id: I5b80cc571555d272c33c0f7560709032efa6532c