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

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



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