Merge "Merge "Catch RemoteExceptions in DataShareCallbackDelegate" into rvc-dev am: 51715229f9 am: 64d87f381a" into rvc-d1-dev-plus-aosp am: ddf64094e6

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

Change-Id: I21121f61b04035d15868889f7b78df260c71b493