Merge changes from topic "cellinfocallback-error"

* changes:
  Add an onError() method to CellInfoCallback
  Add AIDL for ParcelableException