Merge "Adding a TEST_MAPPING file" am: 4c7ec26404 am: eed3725ed2 am: b6f70b3ebb am: 3fe74b6a19

Original change: https://android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/1654098

Change-Id: I82733e9288905c2928a71e08c430850e96ed00e3