Merge "Merge "Handle SyncResultReceiver.TimeoutException" into rvc-dev am: 9856804e am: 4a235e4b am: 2292176c" into rvc-qpr-dev-plus-aosp am: c28c3f9f

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

Change-Id: Ifde6047176abc30a0d6f7800166cacf2045f04d9