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

Change-Id: I4db55ff770ad4db3d07a54023e6cd12a7593ac4d