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

Change-Id: I15915c64ef6ea5df9ac6c3f1c4289fa51e8a718b