[automerger skipped] Merge "Merge Android R" am: 61cddc9080 -s ours am: a8a47a3732 -s ours

am skip reason: Change-Id Ia938e70f256d6d9b9c80f056cb473c8803257e27 with SHA-1 646ebffe4b is in history

Original change: https://android-review.googlesource.com/c/platform/pdk/+/1422481

Change-Id: I47e64c31a6229e1bdf50ad2a6924895819ae772e
tree: 9f3ca8b30cf4217071d58f09e01a037b15f7d55f
  1. apps/
  2. build/
  3. util/
  4. .gitignore
  5. README