Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 am: 52fbd9907e am: 77c9dba023 am: 2da87e65a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476 Change-Id: I32bf8f25ad24ccaa6539ed5d903f7cc619643bbb
This commit is contained in: