Merge "Clean up TEST_MAPPING after default update" am: 8f014fa506

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a7e9943504ad0675e3859f807cf4a92aa1a247e