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

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

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