Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" am: 946af3fa5d
am: 3973c2af63

Change-Id: I40ffaa6591ec51ee792baa2d1ec291a718df0c71