Merge "Ensure DisplayTracker callback is not GC" into main am: 959aadab4b

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

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