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

Merge "Merge "Add targets for tablet/tv product variants" into tm-dev am: 04f59c26 am: 58b58904" into tm-d1-dev-plus-aosp am: de0faabe

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



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