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

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

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