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

Change-Id: I96c7c5d2c4d43ecd8a2264a2b8290fddc1189f5a