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 am: 39c8ad68

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



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