Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e062950
am: e5ff48a6d8

Change-Id: If45e89b2918e38d635cb1ffdba48f163013788cc