[automerger skipped] Merge "Add MultiDisplayList + memory leak fixes" into...

[automerger skipped] Merge "Add MultiDisplayList + memory leak fixes" into sc-dev am: bb1040a5 -s ours

am skip reason: skip tag Change-Id Ifa6b723b6456f5d3eeac1201e76f337250103d6f with SHA-1 d34d6cec is already in history

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

Change-Id: I35e05713464405e9706fe880b2466e0c42f95a2a