Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e12f5e374fd29601182e8b99250a91933a2556