[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-dev-plus-aosp am: 89f88178 -s ours am: ed2f0efb -s ours

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

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

Change-Id: I3342ddd7332a806e38c40252e88b8178e564e4ca