Merge "Remove unused dependencies in SurfaceFlinger" into rvc-dev am: c30ebd0188 am: 01f527aac9

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

Change-Id: Ie543eb3f06c30bd4088629c8a1b4093c3bf3daaf