Merge "Add a test for NonNull CellInfo" am: 3ef63c6f am: ad625145 am:...

Merge "Add a test for NonNull CellInfo" am: 3ef63c6f am: ad625145 am: 021c25d8 am: 6b2c8003 am: 0de4b97d

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2190077



Change-Id: I37a2c4e58b2f5b1098277046d045836347b01e0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>