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

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

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