Merge "Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6" into oc-mr1-dev am: 5f927337" into oc-mr1-dev-plus-aosp