[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified...

[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6 am: b6d1814c -s ours

am skip reason: Change-Id I305ff855f0d5595be13b6ee4e4480abd89ed258f with SHA-1 2387cdee is in history

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

Change-Id: I0a1e2fe364093bb67af967b04aad4e0b31449615