Merge "Ensure that onCellInfo is always NonNull" am: b4be2f45 am: c6111dff...

Merge "Ensure that onCellInfo is always NonNull" am: b4be2f45 am: c6111dff am: 6a9fa605 am: 1431a34c am: f3ba541b

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



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