[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 201a0667b3 am: afaa2afc8b -s ours
am skip reason: subject contains skip directive

Change-Id: I5a4796334c596c9e94c9620e2fb8dce4c9098939
tree: a3f39854eebe3f139f1a80d368dbd3f050583125
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml