Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb382 am: 1b85a98793

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

Change-Id: I38bd4199e4654b8ad58db320cca920e3b53a6d05