Merge "[automerger skipped] Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5 am: b6d1814cef -s ours" into rvc-dev-plus-aosp