Merge "Close assistant activities on closeSystemDialogs" into rvc-dev am: 9e639bb3 am: 833a388c am: 35e63103

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

Change-Id: I288df610062e394a9b1db4b8f9c22177933d274f