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

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

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



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