Merge "Update writeFlagOverrideRequest call in SettingsState" into main am: 991063f6e2

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

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