Merge "Differentiate between empty and unrecognizable display identification...

Merge "Differentiate between empty and unrecognizable display identification data" into main am: c683bc5b am: 7685c407

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



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