Merge "Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" into rvc-dev am: ebb1992cd0 am: 843a1f1a7a" into rvc-d1-dev-plus-aosp