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: I9a765949cf618c104f91daed7f55aa982f987312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>