[automerger skipped] Stop trying to update FDE password from LockSettingsService am: d63d0e12 am: 426b3da0 am: 6d66f9a5 -s ours am: 3b4edfa9 -s ours

am skip reason: Merged-In I46c2a472177836f0c9084e4c3b4ed2e6c0ab61d5 with SHA-1 031a23fa is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016259

Change-Id: Id0580c4ef7425c62eb4d04dba8619daa0705ed3d