[automerger skipped] Merge changes from topics "displayinfocontroller",...
[automerger skipped] Merge changes from topics "displayinfocontroller", "remove_displayinfo" am: 94c22b71 am: 8d5f3ad3 -s ours
am skip reason: Change-Id I22a459e79f509f20c6b38386655c4b49315e3be7 with SHA-1 86b8a847 is in history
Change-Id: Ia852130e1abc4694d4f4da2fd7ccca303e2154bd