Merge "Remove unnecessary calculation of display configuration" into tm-qpr-dev am: 9fefe95b

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



Change-Id: Ib86d6b2de54b3bd508ef683d9690d1adf6eeb887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>