Merge "Prevent non-fullscreen activities from triggering auto-enter PiP" into oc-dr1-dev am: d24ed58bc2
am: 092d675192

Change-Id: I51c5a575c0700879af80a0ecd688f4f0de0eae72