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

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

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



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