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

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1545729

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f00978eacda97356a4c2ccd9647d7d756e37db1