[automerger skipped] Merge "[SEPolicy] Add composer 2.3" am: e4fdac5ac9 am: 228a0740b6
am: 538c9ed394  -s ours

Change-Id: I8f1f405cc7938b65d7d60d6f831b8f213d8b55bc