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

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



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