Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp