Merge "Fix ActivityNotFoundException"
tree: 634428a75099424c2e65c0d9e3fa6f956b28e104
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS