tree 3ec34da17486616022a56372cd1e3e83f976e18f
parent b7ac80f693299a543a70e5fe4e7d11f8c1890b30
parent f6519efeff0a7d5e9ef99f0fbf91271610059224
author SongFerng Wang <songferngwang@google.com> 1631242732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631242732 +0000

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: I430c4e4f1c9f04684b28ddadcc4b220347a557ef