Merge "On-device signing: Add TEST_MAPPING." am: 85d8c24482

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

Change-Id: I52c1849cc0d3a7a74e31ab57a21bd677b002fd59