configstore: should import ISurfaceFlingerConfigs am: b2f9ce2d1d
am: 493fde4481  -s ours

Change-Id: I24af99726b2eb2e8ad3d792fcaa4f3355121c0f2