[automerger] Merge "Keeping the lockdown state in sync with the notification...
[automerger] Merge "Keeping the lockdown state in sync with the notification list" into pi-dev am: 1d207b3a am: c3df03f8
Change-Id: I693e84269da5835dd072a7a29e62c00c4c909f9a