Merge "Merge "Allow network stack UID caller to retrieve cell identity" into rvc-dev am: 855eb749 am: 4f7fa277 am: b8b8f132" into rvc-qpr-dev-plus-aosp