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 skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d75e31a4f1681d2ce0dbb885091cb1e6d7a4dcb