Merge "Add a rust library for android.security flags" into main