Merge "Make display unique id stable across x86 and x86_64 builds" am: 548e116f64

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

Change-Id: I665237df7c290f37d719486eea2223060e0a1a04