Merge "[Trust] Add test target for tablets." into tm-dev am: a4a4f42b

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



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