Revert^2 "Expose AID_KEYSTORE" am: 37a413d1c3

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

Change-Id: I556b3a5e1ff238be74bbf3ca98cfa628e5bc7bb3