tree 82187968ea821551990d84848b56c918f116b438
parent 8a19796728eba656473a192b708151894c881689
parent 6f59202300ab6e686636caa1916023ffe323afb9
author Rubin Xu <rubinxu@google.com> 1618580922 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618580922 +0000

Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e am: 6f59202300

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899

Change-Id: I42e939c406883463a7be51de7ff152c99fe19849