[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: b907baa8f6 -s ours am: 61aa44503a -s ours

am skip reason: Merged-In I9d19cb468db1eba6f4626edba7461e8033331403 with SHA-1 ca672dc67f is already in history

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

Change-Id: I3e43c3797a610e3f3c714cd8d35c27e2487d582d
tree: 04cad94f13296cf8790b34788936adff6cd02791
  1. android-5.10/
  2. android-5.4/
  3. android-mainline/