Merge "Fix NPE in CompanionDeviceManagerService#unlockUser()" into qt-dev