Merge changes from topic "variants_landing" into tm-dev am: ee74679e85 am: 7833347e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17943620 Change-Id: Ie2618b91b800a3c896cda3460051b2e233a7a28b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: