Merge "Remove meaningless parameter in IActivityTaskManager#setLockScreenShown"