Snap for 7080270 from 94b7900a71c1d3d1a037d382df97697be2c30715 to mainline-release

Change-Id: Icea7134f2b9fd90a1e2913d2eb47ee60ceed93fc
tree: 87dfdcc973175f54fdafdbac0368a33a2331db69
  1. build/
  2. os/
  3. Android.bp
  4. OWNERS
  5. TEST_MAPPING