Merge "Fix declination argument boundary checks" into main am: 7d558a4226

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2729274

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