Merge changes from topic "am-a66b146c33cd42f88b9c61c4d6558333"

* changes:
  [automerger skipped] Merge changes Iee462825,I9cd91ecd,Iaccbbd0d,I734c9115,Ibe6f679a, ... into udc-dev am: 09eacb96 am: a3a8ad69 -s ours
  [automerger skipped] locksettings: improve logging of SP and protector changes am: b56a4292 am: dc516654 -s ours
  [automerger skipped] locksettings: improve logging of LSKF verification am: 6318c7e1 am: 4844f871 -s ours
  [automerger skipped] locksettings: clean up logging of cached GK password expiration am: ad578e9b am: 0aa0901d -s ours
  [automerger skipped] locksettings: clean up logging of password history updates am: 0889b6d8 am: 5001ef26 -s ours
  [automerger skipped] locksettings: clean up logging of escrow token operations am: cf5a081d am: 1d9c40fc -s ours
  [automerger skipped] locksettings: only log profile key removal when actually done am: fa5a4b7d am: ace873ef -s ours
  [automerger skipped] locksettings: only log FRP migration when actually done am: 8ff87c63 am: 963e1a0e -s ours
  [automerger skipped] locksettings: move credentialTypeToString to LockPatternUtils am: 816abbc2 am: 736845d1 -s ours
  [automerger skipped] locksettings: zero-pad IDs when shown as hex am: 540914fe am: 71896b34 -s ours