Merge changes from topic "am-f9ab841782c043dd94dd83b30968e972"

* changes:
  Merge changes from topic "cellinfocallback-error" am: 360e25280c am: ed0c722aad am: 28d31b21c4
  Add AIDL for ParcelableException am: d2715b7c70 am: 910a4c60ab am: ef9221ee72