Merge "Require USE_FULL_SCREEN_INTENT permission" am: 91fdf9c594

Change-Id: I2edeca0f5f44cdf05cd82b2c66b160c4617a74fc