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