[automerger skipped] Merge "SF: Clean up HWC2::Layer ownership" into sc-dev...

[automerger skipped] Merge "SF: Clean up HWC2::Layer ownership" into sc-dev am: e9f6e108 am: 0fc2988d -s ours am: d2f3a340 -s ours

am skip reason: Merged-In I508d6aa8ef7a6af848dd54198408d5f311175070 with SHA-1 1b33fc3f is already in history

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

Change-Id: I374719aa73d1f415ca31df00a0afcb270acfe413