Merge "Sync with ISurfaceComposer changes" into tm-dev am: a6a90507 am: 739a16a7 am: ee4c9d74

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



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