Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 am: 52fbd9907e

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

Change-Id: I08065ca7f3565ee677d1162ceb2e99a28770efda