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

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

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



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