Merge "Don't start unlock advertising when the user has no trusted device" into qt-dev
am: e293b064ca

Change-Id: If56ddc3582f01b062f494876c858c58f41bbb2dc