[automerger skipped] Skip ab/6749736 in stage. am: 87fbe1203c -s ours am: 248e14c9a8 -s ours am: 338a3a48f7 -s ours

am skip reason: Change-Id Ic29b1ffb323ad0044a27a98ba1aa08d4935a3bdc with SHA-1 183cfdc021 is in history

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

Change-Id: I0895e8929e932c83dd4e5472b371d151f51c35da