Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6 am: b6d1814c -s ours" into rvc-dev-plus-aosp am: 456051ff -s ours am: de86bdb6 -s ours am: eaffe878 -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: I66b06c6182b79b26cc0732e90ffe727efd51bb66