Snap for 7372391 from 9dabc1ece3cd2f23e80a08a21b7b6b9807337b26 to tm-release

Change-Id: I4960d61a2a8f29146c824aafcad117351bc74d40
tree: 8dc469e64364fb85fbfbfebe72e96676963beb43
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS