Merge 9feb252e5b55fe71b3b730272263893bf27aaa14 on remote branch

Change-Id: I421e033c778f7531bed06af2b416e4d12e1cd2f9
tree: 62028cd5349ed8cd0bc58dcaa32c84bc1bf8fc25
  1. apex/
  2. API-level-policy/
  3. Android.bp
  4. OWNERS