[automerger skipped] Merge "Add local logs for TelephonyDisplayInfo changed" am: 02ae7ec0 am: 8787e9f3 am: be7ea710 am: 55af3f19 -s ours

am skip reason: Change-Id Ib4a3a7a14d7d0e544aadf1bfb21ad390f1ba76a7 with SHA-1 571a9346 is in history

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

Change-Id: Ide277856e990f5b2d40c194ddfb85419e20e1d97