[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: c8b3f9e46f -s ours

am skip reason: Merged-In Id5383fd19f523a6eeb95f2b15ab0141273bd02e7 with SHA-1 e01811d13a is already in history

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

Change-Id: Ie7c738060f2f56223dd5e1052dbe077575249b63