Merge "[automerger skipped] Fix leakage of DisplayContent referenced from...

Merge "[automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6 -s ours" am: f1710ab1 -s ours

am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 c3eaf662 is already in history

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

Change-Id: I8f83f5f8dfcd47e86ef34a3aed9e33467bbf1fa6