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

Change-Id: Id58bce2053b4ca532ab07020875b1e4a633dafc6