Merge changes from topic "dream-restart-reland" into tm-qpr-dev am: ef7f9416...

Merge changes from topic "dream-restart-reland" into tm-qpr-dev am: ef7f9416 am: 601f091a am: 644ce2b8

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



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