Merge "Add a C++ library wrapper for the android.security flags" into main am: 64f0afd076 am: 975253702e

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

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