Merge changes from topic "am-8afcef02fb40430cb2d15df5ac59dec5" into rvc-qpr-dev-plus-aosp
* changes: Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am:3e5a0605cfam:333aa55f87am:cf72da82a5LockSettingsService: move database storage am:a486e2d780am:e6fa66af66am:0697e84223
This commit is contained in:
committed by
Android (Google) Code Review
commit
9485a7a904