Snap for 10952523 from c3e289a82622aefa0cfe2c78fb39fe9636983648 to mainline-mediaprovider-release

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