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 am: 50b573d3

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



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