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

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



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