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

Change-Id: I3dddc7358cf0147dbd334f9f7e0ec7365048b65b