Mark ab/6881855 as merged am: 2e18af1de0 am: 43e26b1687

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

Change-Id: Iefbf8dc267c6a32a2a32421f8ed7c654b80b04b6