[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: e01811d13a -s ours

am skip reason: Merged-In I90608242ee02771f107a9bb32c865f37bdf38c0f with SHA-1 1b0f117a35 is already in history

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

Change-Id: I6e142e55995b67d90f036203d2d8d6199bbba92b