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

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

Change-Id: I55ed3874b383f029061778261c150fe410dba1e3