Snap for 6287519 from 45777b7e187931db681230bea2be4f2db020c680 to mainline-release

Change-Id: I44d4197d3fb4529147303f58527508cdc3d90a63
tree: 1de9b7b71ee4add95776b718044acced8f100bc7
  1. apex/
  2. Android.bp
  3. OWNERS