Merge "Merge "BinaryTransparencyServiceTest: Fix TEST_MAPPING" into tm-dev am: 90db39ac am: 331d51e1" into tm-d1-dev-plus-aosp am: b28216c1

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



Change-Id: Ia3b06c07a517493a7d671d02fe03907ad58b2e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>