Android R Preview 4 (RPP4.200409.015)
Merge stage-aosp-master to aosp-master - DO NOT MERGE

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