Merge "Fix typo in comment in CTS Libcore non-OJ test configuration." am: 7c97d0d749 am: ddcd23c654 am: 527e20c5d4

Original change: https://android-review.googlesource.com/c/platform/cts/+/1679607

Change-Id: Ib130e72b6424d75631826cd69e887e949ada0a54