Merge changes from topic "am-39ce9be4fd4c4f07934bf36fada40444"

* changes:
  [automerger skipped] Merge changes Iee462825,I9cd91ecd,Iaccbbd0d,I734c9115,Ibe6f679a, ... into udc-dev am: 09eacb96 am: f38decc0 -s ours
  [automerger skipped] locksettings: improve logging of SP and protector changes am: b56a4292 am: 366dc5c6 -s ours
  [automerger skipped] locksettings: improve logging of LSKF verification am: 6318c7e1 am: d7518873 -s ours
  [automerger skipped] locksettings: clean up logging of cached GK password expiration am: ad578e9b am: 13814c78 -s ours
  [automerger skipped] locksettings: clean up logging of password history updates am: 0889b6d8 am: d77c1ab0 -s ours
  [automerger skipped] locksettings: clean up logging of escrow token operations am: cf5a081d am: b45adf13 -s ours
  [automerger skipped] locksettings: only log profile key removal when actually done am: fa5a4b7d am: eb4abbf5 -s ours
  [automerger skipped] locksettings: only log FRP migration when actually done am: 8ff87c63 am: de0d9466 -s ours
  [automerger skipped] locksettings: move credentialTypeToString to LockPatternUtils am: 816abbc2 am: eb40ca48 -s ours
  [automerger skipped] locksettings: zero-pad IDs when shown as hex am: 540914fe am: 2dde840b -s ours