Snap for 7809064 from b0dc09fa16a4d2160c56e47faccfb4c2e5c9dbc1 to tm-release

Change-Id: Ica63f0e101038d8f143d4511fb0c5cb9d788e0b7
tree: d3f5fca1312986af0f2c6e9136f6e8c0f3f192f8
  1. apex/
  2. Android.bp
  3. OWNERS