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: I0910da7d82f7594f63c9b27931488ad46f877d9d