Mark ab/6881855 as merged am: 6e42d6d4ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/13112090

Change-Id: I2356b3b1612e516fee817b805f7b5cbfc6f6cb59