Merge "Ensure that onCellInfo is always NonNull" am: b4be2f450b am: c6111dff5b

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

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