Merge "Merge "Only allow the system server to connect to sync adapters" into...

Merge "Merge "Only allow the system server to connect to sync adapters" into qt-dev am: 99ccb4e5 am: 822fbf61 am: ea69ad58 am: f15b3c25 am: 6a68d207 am: ff8964d7 am: cdcc7859 am: bf51ebd5 am: bd3fb444" into tm-d1-dev-plus-aosp am: c7225395

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



Change-Id: I431269276ae82a9f3b87b4092bc1972b72f4b465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>