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

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

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