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

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



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