[automerger skipped] Merge "Fix for NullPointerException in SmsMessage" am: 49ef1ed315 am: 9b12a745f4 am: b79bab9396 -s ours
am skip reason: Merged-In I197681cf79bbe47521d77432ffcd56d3e3acceab with SHA-1 5d01657a0b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2296057
Change-Id: Ia1e43dcba0f50ee17d8bc38eaf42912fe5bc51d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: