[automerger skipped] DO NOT MERGE: Track SurfaceComposerClient changes am: df7c7255 am: 74e9c52a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie89cf4419e4e36b0c9dc3f3c8b96a7a8b153f56f