Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp
am: e8d229c70f  -s ours

Change-Id: I6d7c72caae433d205bae769921d7250ad2bce0b7