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

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

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