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: 0ae9b36d am: 8a2299e1

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



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