Merge "LocalDisplayAdapterTest - fixed issue with real DDC loading for fake display" into udc-qpr-dev am: 38645f3450 am: 3c7db60049

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

Change-Id: I4c61dd34ac5890faf0a1c81a155778aa022deb91
Signed-off-by: Automerger Merge Worker <[email protected]>