[automerger skipped] Merge "Create separate source of truth for display info"...

[automerger skipped] Merge "Create separate source of truth for display info" into udc-dev am: b3b1502e am: 3d687fac -s ours

am skip reason: Merged-In I633ab09faa1ae3b5103078155e3781f3433ad1fc with SHA-1 ff8c691d is already in history

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



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