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

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

Change-Id: Iedc6c5567f8f4af3483bae05238affb1c1e44e83