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

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



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