[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: dbfcc1885b -s ours

am skip reason: Merged-In I8fdd7aa69407d7a4ece5cc018f741639507e1ed6 with SHA-1 b375a44b5d is already in history

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

Change-Id: I7a9571b98fe66377155559d1ee37898d8399f15e