Merge "Remove unnecessary calculation of display configuration" into...

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

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



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