Merge "Refactor PlatformKeyManger to remove mUserId to fix two tests that fail on clean devices without secure screenlocks"