[automerger skipped] Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0 am: 871566afab -s ours

am skip reason: Change-Id Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a with SHA-1 b4be4c8be3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3840d17e28b911856f05f093a6e91e8cca2cc674