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

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

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