Merge tag 'android-13.0.0_r3' of https://android.googlesource.com/platform/packages/apps/Messaging into HEAD

Change-Id: Idc923a42c9fd424d13346b59fb866fb504929f1f