Merge "Fix flag namespace for secure_array_zeroization" into main am: ccc9a84f

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



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