Merge "LockscreenShadeTransitionController: add more tests for DepthController...

Merge "LockscreenShadeTransitionController: add more tests for DepthController interactions" into tm-dev am: 36ad1aee am: 5d86671a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17346987



Change-Id: I7e91683dc6ccb4459222de1a9988b7fcdf465cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>