Merge "[pm] fix platinum test mapping" into tm-dev am: 082d5f3a am: 7487b7a2

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



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