[automerger skipped] Merge "Remove displayBounds when computing layer bounds"...

[automerger skipped] Merge "Remove displayBounds when computing layer bounds" into sc-v2-dev am: d51ac5e0 am: a0d6367b -s ours

am skip reason: Merged-In I1f5072adb674c7c4dacb6a392473821968c67767 with SHA-1 b09c6557 is already in history

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

Change-Id: I348c909907ef956b68ce5694c38d3664fed3bba3