DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Ib81ba3288a986546bc570c3759c55d026add591a
Change-Id: I2acfeb6cfc83a80056a685355cc367a5514da069
tree: b5675827d9b618b366bcef3caf44a4cc9e58d9c0
  1. core/
  2. services/
  3. tests/