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: 9418b10a

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



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