Mark ab/6881855 as merged am: 0d3ae0b108 am: da6c4c5b35

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/apache-harmony/+/13111888

Change-Id: I4086f61bb16300fd5f6cc465b6aba24d42785d9b