[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: 84327c00 am: 00203b2f -s ours

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

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

Change-Id: Ic6f95f30a509d3a8908ceb7f7959b70c8f6d2c86