Merge "Keystore 2.0: Protect libselinux against concurrent access." am: 8176ec07ce am: e389878b3a am: 6825950ec1

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

Change-Id: I73c1398f0d9d59a9ef521cac865d628319be4a0d