Merge "SF: Fix unit tests re-registering a display" into udc-dev am: 89d7a127 am: dfcb10db

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



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