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