Merge "Don't use sync transactions if not needed" into rvc-dev am: 27c733c7f7

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

Change-Id: If71a265c1983704e27430257d1b57f22ae930174