Merge "Catch RemoteExceptions in DataShareCallbackDelegate" into rvc-dev am: 51715229f9 am: 64d87f381a am: 6998d067b0 am: 248783b4d6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11895260

Change-Id: I13c7c2491d874c8125321226de8062f3398c7fe1