[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 70bee78513 -s ours am: 8db2c483ba -s ours

am skip reason: Merged-In I1b93005199964436709c9b37824b35d551377e95 with SHA-1 7fde4bfe5a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libwebsockets/+/16843711

Change-Id: Ib2e7f603d8b3514176164dcdaff8bc0927af9b7d