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

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



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