Merge "The telephonyDisplayInfo is wrong after doing compatibility." into sc-dev am: f30a4cd112 am: f6519efeff am: 4e969c2bb3 am: 2b890a70c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15786476 Change-Id: Ib494a99d00fbeaa3855662d302f7aac88e07f66f
This commit is contained in: