[automerger skipped] Merge "[RESTRICT AUTOMERGE] Remove unnecessary test." into oreo-mr1-cts-dev am: 3b1e6518bd -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: Ia0a00a962766923279b1c6f655088f2cedca262b