Merge "Alternative fix for preventing PiP from screenshot sharing." into oc-mr1-dev
am: 6d753c88d9

Change-Id: Iffd473679aab7ca6f92852b664074b82d5198b17