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

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

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