Merge "Add targets for tablet/tv product variants" into tm-dev am: 04f59c26 am: 58b58904 am: 84f865bd am: 87b03c15

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



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