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

Change-Id: I57175352ca15a23dc7daecc352017dc2bb9ee79e