Merge "Merge "Framework did not notifyDisplayInfoChanged" into rvc-dev am:...
Merge "Merge "Framework did not notifyDisplayInfoChanged" into rvc-dev am: 5bebe02d am: b96d9ac1" into rvc-d1-dev-plus-aosp am: b9779a54 am: 100d61fd
Change-Id: I418c7cb665884f8e52207b920590b31169870fc3