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

Merge "Don't use sync transactions if not needed" into rvc-dev am: 27c733c7 am: 637cded0 am: c0c16627

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

Change-Id: Ifcd1f1002304e73908e73d066a59d765a19fffc1