Merge "nullptr check on suffix." into main am: 1f2f3de8 am: 3c6c8a3b am: 2ba229b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2815884



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