Mark ab/6881855 as merged am: c671841032

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/13112083

Change-Id: Iadcec68d76d530e77de9f727202f34abb195562e