Merge "nullptr check on suffix." into main am: 1f2f3de8ff

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

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