[automerger skipped] DisplayInfoController and NetworkTypeController skeleton...
[automerger skipped] DisplayInfoController and NetworkTypeController skeleton implementation am: 314e3b53 am: 55cefc95 -s ours
am skip reason: Change-Id I343f7e92ea9d324c954eb67011998301729fbe86 with SHA-1 870a1ae5 is in history
Change-Id: I065be6ac91b457452bc6a8e874ea897d504269f4