Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours" into rvc-dev-plus-aosp am: 456051ffc8 -s ours am: de86bdb681 -s ours
am skip reason: Change-Id I305ff855f0d5595be13b6ee4e4480abd89ed258f with SHA-1 2387cdee2c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331803
Change-Id: Ib09ad034240d611bb7a338aa38b7e7b6b6aa1ca3
This commit is contained in: