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

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

Change-Id: I967e3a7b176ea18fe77dec80c5a1890dd8d694a6