[automerger skipped] Stop trying to update FDE password from LockSettingsService am: d63d0e12cc am: 426b3da0d1 am: 6d66f9a556 -s ours
am skip reason: Merged-In I46c2a472177836f0c9084e4c3b4ed2e6c0ab61d5 with SHA-1 031a23fa87 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016259
Change-Id: Ie4dde1959f3832241ab1e25fe627725d84758d18
This commit is contained in: