Mark ab/6881855 as merged am: 482c9e833e am: 0a8ff1dbc4

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

Change-Id: Ib0155a3689bcd6f892c8e57ee257d07dcd70e6db