Merge changes from topic "dream-complications-relayout" into tm-qpr-dev am:...

Merge changes from topic "dream-complications-relayout" into tm-qpr-dev am: 0471f7b8 am: 8612b1bb

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



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