Merge "DO NOT MERGE (these tests were removed in master: aosp/915361)" into pie-cts-dev