Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev
am: a39d888651

* commit 'a39d888651493d20f3814cd88a39a521450b3eac':
  Suppress unlock notifications on non-FBE devices.

Change-Id: I9e17a23b0f3127ac5ae0f08cbf0a6c306aaba9d5