Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Id7153798ef9066f1e2ed7231c2034603f38d53c2
tree: 55786573d3cfb58fae53085826d4477522c933b4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS