Merge "Don't update desired display mode specs for disabled displays" into udc-dev am: f1c4b2ef am: bde9f426

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



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