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

Android 16.0.0 release 1

Change-Id: I38156e95bca1b18424f82fdf6eedc95eb8355df5