Merge "disable sync_on_suspend when flag is set" into main am: cfec879a am:...

Merge "disable sync_on_suspend when flag is set" into main am: cfec879a am: b5ce7aa4 am: 914f701a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2762661



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