Merge changes from topic "variants_landing" into tm-dev am: ee74679e am:...

Merge changes from topic "variants_landing" into tm-dev am: ee74679e am: 6019dc9d am: f98c73d6

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



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