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

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

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

Change-Id: Ie1920ac639c4ec4bad9ddcd780072394f50fd1ba