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

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

Change-Id: I08aeb77aea7c20ff8debc8c653d3eeea31ca99a3