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

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

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