Merge "Merge "Fix LockSettingsService unit test flakiness" into qt-dev am:...
Merge "Merge "Fix LockSettingsService unit test flakiness" into qt-dev am: 873e0629 am: e65bd957" into qt-r1-dev-plus-aosp
am: 6d39a8ab
Change-Id: Ib610a6264e0481a8f8c52301211810d244e620fd