Merge "LegacyState does not send notifyDisplayInfoChanged am: 545dd7778c am: 6acc0754d3 am: b5a0a93648" into rvc-qpr-dev-plus-aosp