Android CTS 12.1 Release 2 (8602832)
Merge cherrypicks of [2065068] into sparse-8444732-L87600000954400916.

Change-Id: I68f40795b135bd9f5464e30147faf95cfb9e5da6
tree: 7a71dde8c598c57bd812c488e53b0a6d535dba61
  1. filegroups/
  2. test_harness/
  3. OWNERS