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: 2270b105 am: c0ad0321

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



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