Merge "Make CERT_CORRECT actually correct." am: 0fba546f75 am: a7a68ff888

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

Change-Id: Ib985145cfd74090187555403d9cfbf1f1fdeac5d