Snap for 7246408 from 74e1e4309a8841fcd35ef33f7856f6ab3e94eb8f to sc-v2-release

Change-Id: I047591017bb3905149999e9efa102b19216e7136
tree: f2a7a22e088dc9d87104910acb5d508e8d1a55f8
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp