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

Change-Id: If7424438fd3364d944ffb0ad1ea02214011ab447