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 am: d7c9d9ad

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



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