[automerger skipped] locksettings: improve logging of SP and protector changes am: b56a4292 am: dc516654 -s ours

am skip reason: Merged-In I9cd91ecd3bb80b59fb367072d7f30dc90a5ee332 with SHA-1 72ba8378 is already in history

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



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