Merge "disable sync_on_suspend when flag is set" into main am: cfec879ad6 am: b5ce7aa444 am: 914f701ac0 am: 36bbb7d13c

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

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