Merge "Add a C++ library wrapper for the android.security flags" into main