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

am skip reason: subject contains skip directive

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

Change-Id: I5962dd3b2328aef9352ee59e53fc3292a0591233