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

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

Change-Id: Ic4cc211a9c5fc770cb7ab99d87499a438f665d8c