Merge "Remove duplicate code and add fn for flag check" into main am: 6f80e95312

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2852952

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