Merge "Fix inconsistant nullability doc on onCellInfo()" am: 991fa9e77b

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

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