[automerger skipped] Merge "Renamed DisplayInfo to TelephonyDisplayInfo" am:...
[automerger skipped] Merge "Renamed DisplayInfo to TelephonyDisplayInfo" am: 50665529 am: 236f2019 -s ours
am skip reason: Change-Id Ic507b6bf082ca5510ff6d1dcde501f5be9ef074f with SHA-1 ac3ca335 is in history
Change-Id: I6433ed589f661703f5a6408987beec999fa3abe4