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

am skip reason: subject contains skip directive

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

Change-Id: Ib25cc4e431840a64e2f5c2605acf491bf59547df