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

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

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