[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" into sc-v2-dev am: d0dba392 am: 9b4414fc -s ours

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

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

Change-Id: I668272df12a768adbabdd28be37591d6c217e129