[automerger skipped] Merge "Make display unique id stable across x86 and...

[automerger skipped] Merge "Make display unique id stable across x86 and x86_64 builds" am: 548e116f am: e1496814 -s ours

am skip reason: Merged-In If15b66775fa48f14cc56bbd23536b61844b7ae37 with SHA-1 d308b012 is already in history

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

Change-Id: Ibb8ee401933bc3d3070c2a307f0ae0404419a9fc