[automerger skipped] Merge "Use a strongly typed Pid in WindowInfo" into...

[automerger skipped] Merge "Use a strongly typed Pid in WindowInfo" into udc-qpr-dev am: 73ab4db8 am: 8f966bf6 -s ours

am skip reason: Merged-In I6a3572ff10b259feae74863c0203bb5f085f233f with SHA-1 aeebeb4e is already in history

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



Change-Id: I5345ece0ccd2a805e64ba9c19d12038c6a5d6592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>