Merge "Properly handling situation when display is added and removed...

Merge "Properly handling situation when display is added and removed instantly" into udc-dev am: 23636fed am: d6817b1d

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



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