Merge "Mark configstore-utils as double_loadable"
am: a7b9291b82

Change-Id: Ieee85a4e7083d9814905ec74a02d5e535db4c93e