Merge "Adding TEST_MAPPING to frameworks/base/keystore" am: 5dd8206c04

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1405551

Change-Id: Ic024e549c8676ad772b707e737ed52c00bf75c88