Merge "[SEPolicy] Add composer 2.3" am: e4fdac5ac9
am: 228a0740b6

Change-Id: Ia03d9c420d3a47cb15d2284487a81bb69fbfa54a