Merge "Add C++ bindings for Keystore flags" into main am: 5ea8af50c0 am: 25977a29b8

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

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