[automerger skipped] Merge "LegacyState does not send...
[automerger skipped] Merge "LegacyState does not send notifyDisplayInfoChanged" am: 92250a64 am: e69a404c -s ours
am skip reason: Change-Id Ife70786f426a884a3d935b509ebc9f75377c00bc with SHA-1 545dd777 is in history
Change-Id: I330098630a66fb40ad011caccb7c2b75adf398bf