Merge "Merge "Handle an edge case that can reset settings provider data" into...
Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6 am: 30f2df2f" into oc-mr1-dev-plus-aosp
am: d1496ec2
Change-Id: Ib0fb011ab8723c9da3869987b354515e59b88d65