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

Change-Id: Ibe311e2c5518415cca256b3c82573d6d4c8bb883