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: I0a41f865546d6b1c170378ac9eb9eb07ae758d72