[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6408b28b86 -s ours am: 27ecd1070e -s ours am: 42f4e64935 -s ours

am skip reason: Merged-In I80dc1f6cc24e8db463935d235771c9bff9d16f0e with SHA-1 b95ea91a59 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/16278461

Change-Id: I3f6ea967335a5fe580375004dea141abc6d42971