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

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

Change-Id: Ib3018475bfe30b0c253ac792698eb9e2b5fb8177