Merge "Fix missing computeIfAbsent() method in L_MR1 and M" am: db1ebc265c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1341554

Change-Id: I4bdfca1d8b537b3940eec4ecf1a166b78589b2db