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

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



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