Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp
am: 3fd761f85d

Change-Id: Ib0c3e613fc916dd8b9fe32b2e49fd14cf4de22b2