Merge "Don't use sync transactions if not needed" into rvc-dev am: 27c733c7 am: 3c65b429 am: 82d3ea2b am: d28cfa4f

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

Change-Id: I7518a770974e4df4bafb61497d32791b7b308685