Merge "Make display unique id stable across x86 and x86_64 builds" into sc-v2-dev am: d0dba39225

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

Change-Id: I54070afca340ddb5352a636a303ce609ab659761