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

diff --cc services/core/java/com/android/server/LockSettingsService.java
index fbbdccc,90359f9..fb1021e
--- 1/services/core/java/com/android/server/LockSettingsService.java
--- 2/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@@ -47,9 -47,9 +47,10 @@@ import android.os.Handler
  import android.os.IBinder;
  import android.os.IProgressListener;
  import android.os.Parcel;
 +import android.os.Process;
  import android.os.RemoteException;
  import android.os.storage.IMountService;
+ import android.os.storage.StorageManager;
  import android.os.ServiceManager;
  import android.os.SystemProperties;
  import android.os.UserHandle;