[automerger skipped] Merge "Ensure DisplayTracker callback is not GC" into main am: 959aadab4b am: 00c2e245c4 -s ours

am skip reason: Merged-In I124563b1a4d8a147d0e4570650e88c5aa2c2c8aa with SHA-1 6b2f433773 is already in history

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

Change-Id: I80c9d62d67108bc19f8feff046a47e2e13ec2a89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>