[automerger skipped] Fix leakage of DisplayContent referenced from TransitionController am: 6c04f9b6da -s ours am: 732bbb2021 -s ours
am skip reason: Merged-In I44e2a794981fc114ada0ce98cd2471adf623d856 with SHA-1 491914c17c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061629
Change-Id: If606ba47797aa7890ecae1b4e9b16e8a243ccf9f
This commit is contained in: