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

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

Change-Id: Ie947c88f3a92b14c95dc4c44a52003fc6e312a34