Merge "Make int32_t conversion explicit" into main am: c36f3abcb6 am: 59c1700455 am: 4926e4a2a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2751929

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