Merge tag 'android-12.0.0_r16' of https://android.googlesource.com/platform/packages/apps/Messaging into work

Android 12.0.0 release 16

Change-Id: I8a9a689eae6c645a44a57d9cf276eabc77a54c09