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

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

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