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

Change-Id: I82384a2fb55e4f66e627a9e70f729fb5a2bff8a1