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

Change-Id: I762c0e1a0039589ebcd0f25c57bfeae0e3d4b339