DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Icd5130d2a986a5028ca90b6a5e3d91612143e159
Change-Id: I341c3e05b4a511d4086565cb8b49b538b3d148a7
tree: b6520a1d335a866e7a40d1cef6db4e730eac7f51
  1. tests/