Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Remove unnecessary test." into oreo-mr1-cts-dev am: 3b1e6518bd -s ours" into pie-cts-dev