Merge changes I78dd3268,I8ce35a82 into main

* changes:
  system_server: make UnlockedDeviceRequired fix unconditional
  Add unit test coverage for unlock attempts in TrustManagerServiceTest