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

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

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