Merge "[2/7]Add PlatinumTest annotation to tests" into udc-dev am: b4f8ef97 am: 2b8d135f

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



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