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

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

Change-Id: Id1214838d1f66b0ab56b05d9b4edbd6c0378f0f4