[automerger skipped] Stop checking FDE password cache am: f33dbe05 am:...

[automerger skipped] Stop checking FDE password cache am: f33dbe05 am: 5576b115 am: 67721acf -s ours am: a3b2d2e2 -s ours

am skip reason: Merged-In If1bb80dfcc015aeea19916a88c89a4067e6ada32 with SHA-1 6ab6ad82 is already in history

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

Change-Id: I19d1d84aa82be290acc6fe53bd2ff1d48fb4d5de