Merge "Hide notifications when in Lockdown mode" into pi-dev am: 36b0b60e40
am: aee0b80abf

Change-Id: I07f7d05332a894582e52da06d3ba3085144c9ca8