Merge "Configstore HAL is down-revisioned to 1.0" into oc-dr1-dev-plus-aosp am: 8b608af7cd  -s ours
am: 94c6c15fcd  -s ours

Change-Id: Ia515ef2be8e414aad83a49f9df60c962addfd1e2