[automerger skipped] Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 84de511df4 am: b138d759f5 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/dng_sdk/+/1356363

Change-Id: I650598f6ae247634403a067af179c06656e87bda