[automerger skipped] Merge "change container of device_state_flags from system...

[automerger skipped] Merge "change container of device_state_flags from system to system_ext" into main am: d1fe77fd am: 1e6f02f3 -s ours

am skip reason: Merged-In I586cf7e238d362175f6b90f8809f56577d6b19bb with SHA-1 be8d6dcd is already in history

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



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