Snap for 6386567 from bc7b3543d4619f4a9acfe5533ffb858baacd431b to sc-release

Change-Id: I9325d9c6a054bbad13234b11667e35839d9b1c7d
tree: 9e3eb0c537ba3dcb438c34e1879aa00130da70fa
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle
  5. OWNERS