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

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



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