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

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



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