Merge "Fix notification bar can be dragged when SIM PIN lock screen." into pi-dev am: 5e019b5f8b
am: 24256992c3

Change-Id: I1440915d56efbd438849db69d03168c95d14093f