Merge changes I0880685c,I865ec19d,Id3a1e34b,I31c4f4d2,I17103be4 into main

* changes:
  Fix refreshDeviceLockedForUser() to use correct trust state
  Improve LockStateTrackingRule
  Add flag fix_unlocked_device_required_keys
  Fix kotlin nullable errors in TrustTests
  Include TrustState in TrustManagerService dumpUser