Merge "Add targets for tablet/tv product variants" into tm-dev am: 04f59c26 am: 44eb170f

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



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