[automerger skipped] SurfaceFlinger: Safely cast from IBinder to Layer::Handle am: a8c7c54e am: 7a8447fa am: e4c533ea -s ours

am skip reason: Merged-In Iece64fca254edfd0b82e05ad9629824b2364cc13 with SHA-1 f9096655 is already in history

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

Change-Id: I0638e51206ab10b716550dc0b78617c551677008