[automerger skipped] Merge "Mark configstore-utils as double_loadable" am: a7b9291b82 am: eba42a4d6b
am: 216d1f775c  -s ours

Change-Id: I741e6c7b4378ea1074f527bde663cd3ee9795bb0