Mark ab/6881855 as merged am: 94ab13d307 am: 52f6b5e2ff

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey/+/13112568

Change-Id: I0687ef9491bc895fa0b1a61ed410f9aecbbe2a99