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

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

Change-Id: Ie2f81b0e175d975f4eb39315f5a30840275789eb