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

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



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