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

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

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