[automerger skipped] Skip ab/6749736 in stage. am: 3d22910089 -s ours am: 98b5e240eb -s ours am: a906675452 -s ours

am skip reason: Change-Id I786a11712dd0f5139b8b69bff36c916a7a80b29f with SHA-1 f1bc609120 is in history

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

Change-Id: Iff68968212ddb3988cda902096469245359a026f