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

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

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