Merge "Fix invalid shift of 32-bit value." into main am: 4fd5fe07ba am: 346a37f7d8

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

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