[automerger skipped] Merge "Renamed DisplayInfo to TelephonyDisplayInfo" am:...
[automerger skipped] Merge "Renamed DisplayInfo to TelephonyDisplayInfo" am: 5bf3340c am: e5f4a16b -s ours
am skip reason: Change-Id Iac4556f29938d6ef57c76888321681df2935cfcd with SHA-1 cd3016eb is in history
Change-Id: I969068777f4c327fa020b04056e2309654f3b668