Merge "Adding TEST_MAPPING to system/security/keystore" am: 3b7ee238bd

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

Change-Id: I42d77a368d901a7610f85f073fd981907ad1a0ae