Mark ab/6881855 as merged am: 078bc118fa am: aefbc692ad

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

Change-Id: Ifaf634484d1c2bf84020565e216c472954854282