Merge changes from topic "am-8afcef02fb40430cb2d15df5ac59dec5" into rvc-qpr-dev-plus-aosp

* changes:
  Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87 am: cf72da82a5
  LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66 am: 0697e84223
This commit is contained in:
Automerger Merge Worker
2020-02-28 21:39:04 +00:00
committed by Android (Google) Code Review

Diff Content Not Available