Merge Android R

Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
tree: 5c8d95fe6f21c171ada293529476ac332cd7acd9
  1. core/
  2. services/
  3. tests/