Merge "Add psap_ai flag to protect DeviceConfig flags" into main am: 494fd28753 am: 47f505bb5c

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

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