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

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

Change-Id: Ifa0d06af6c9ef1a55f58fd9196a7275f9e33dd41