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

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

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