Merge "Clean up TEST_MAPPING after default update" am: 8f014fa506 am: 7206540a30 am: eba2474330 am: 5b5973c5d4

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1584430

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96184eec1a79bb00c2718baf3c1c371a5da7aac2