Snap for 11035523 from c3e289a82622aefa0cfe2c78fb39fe9636983648 to mainline-extservices-release

Change-Id: I4408fce7475cd56f699eb1ebf976e9a9a20a3f51
tree: 0dd1564dd30a0fd9af99c4f1b7d88ead03a2b120
  1. apex/
  2. framework/
  3. service/