Merge "Merge "Fix Assistant breaks after stopping the app." into tm-dev am:...

Merge "Merge "Fix Assistant breaks after stopping the app." into tm-dev am: 4c419129 am: 265297b1" into tm-d1-dev-plus-aosp am: 24cf39a3

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



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