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

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



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