Snap for 7362794 from ca16c0fd6b6b6cd24df84a7d12d39014b1e63a15 to sc-v2-release

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