Android CTS 13.0 Release 4 (10119802)
Merge cherrypicks of ['android-review.googlesource.com/2547833', 'android-review.googlesource.com/2561351', 'android-review.googlesource.com/2569750'] into sparse-9985740-L69800000960307031.
SPARSE_CHANGE: I9e72a6146e1ba8a052274bcf0af78b781ae516e1
SPARSE_CHANGE: Id4430f92d303df2a4ee4a262b15e169e85ac1aa3
SPARSE_CHANGE: Idee5b89f696fbf756ef0b362b4b9305fabae2213

Change-Id: Ic4613845f6ebbfc51aafef58866985c71e7fdd4d
tree: c77892488525111fbf5bae47c8ec047788f8c367
  1. filegroups/
  2. test_harness/
  3. OWNERS