[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b72b3a6c20 -s ours am: 55f4686e5d -s ours am: fc5fb3957b -s ours am: 92d21c4ff6 -s ours

am skip reason: Merged-In I14deedda301fc013bc6cff0fa9f31225c991f033 with SHA-1 7fcf5a9629 is already in history

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

Change-Id: I2f6ede90559a2c3303edd2422d4444fd59cab53e