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

Change-Id: Id198bec6043b92077c66c1ff83e3f72cd80d8128