Merge "Add API to disallow entering PiP when launching a new activity" into oc-mr1-dev am: 3ea1e3d57d
am: 6514dca8ee

Change-Id: Ic21c453ab216bb3d4a58542c4efd1f06ee66bc9b