[automerger skipped] Merge "Add default configs for module service stubs" am:...

[automerger skipped] Merge "Add default configs for module service stubs" am: a22e6809 am: 7cab79c9 -s ours am: 76222d3f -s ours am: 25ff5fd7 -s ours am: 9cd482d6 -s ours

am skip reason: Change-Id Iff6a5a840c5dd7731e881d7db379915375d02324 with SHA-1 180ec39a is in history

Change-Id: Ia9220ed8b1a398e744c3e4db9d7e549dfb76be9d