Mark ab/6881855 as merged am: 2e18af1de0

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

Change-Id: I00eed6f9cb5ac7e1f1e9e7a6e717f6a1186a0ce3