Merge "Add support for CellInfoCallback#onError" am: 893f130772 am: 194fde3adf
am: 0be5a53070

Change-Id: Idc820849547095e4043b869dc6fbaeb6cc5b9584