[automerger skipped] locksettings: clean up logging of password history...

[automerger skipped] locksettings: clean up logging of password history updates am: 0889b6d8 am: 5001ef26 -s ours

am skip reason: Merged-In Ibe6f679a17b887261711e0fd7da1b62a114ce7e6 with SHA-1 61729d86 is already in history

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



Change-Id: Ib9dbd6b5347ec6a92524fe5afc01d2423fdcdad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>