Merge "Keeping the lockdown state in sync with the notification list" into pi-dev
am: 1d207b3af5

Change-Id: Ifd324519350b2aaac9debbf7c89338af8e139a42