Revert^2 "Expose AID_KEYSTORE" am: 37a413d1c3 am: fe8e0de9a9 am: 61ce76485f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1670266

Change-Id: I4796c9ed21699aa1ddaa63094101e19c493101e8