Fixing merge conflicts am: b3e7a5e887 Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/2067882 Change-Id: Ic95bd6b899dacd209a30aeabb20ad957aaed4355 Signed-off-by: Automerger Merge Worker <[email protected]>