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