Mark ab/6881855 as merged am: 078bc118fa

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

Change-Id: If5ae74f91003e5833867f94b4b1c5cee4ee08206