[automerger skipped] Fixing merge conflicts am: b3e7a5e887 am: dedb0956e0 am: 0c1c26da6b -s ours am: b58c564647 -s ours am: 8a7c7e702e -s ours am skip reason: skipped by user agespino Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/2067882 Change-Id: I3bf602562d3bd98ed013a2e33676305efc8e6778 Signed-off-by: Automerger Merge Worker <[email protected]>