[automerger skipped] Merge changes from topics "displayinfocontroller",...
[automerger skipped] Merge changes from topics "displayinfocontroller", "remove_displayinfo" am: 72b90154 am: f63f9b5b -s ours
am skip reason: Change-Id Icd31e7b9c4e22bff50089d1af64ff7ed58f5111a with SHA-1 b3b549fc is in history
Change-Id: Ib0ce0ab489ebbd468afe91607710ae2e873fb582