Snap for 8151064 from 95b8c7c51738969ef1029906a939d624fd9411d3 to tm-release

Change-Id: I407feb4abcd53a5dd85ccfefe080ae4f946db05e
tree: 40e54e551a2cd8d9c799b17e37988fe043cef85e
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS