Merge "Migrate Test mapping" into udc-dev am: 15780e67 am: f61482ce am: 780ba65d am: 37d82b51

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



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