Update test expectations due to renaming methods/fields in String Bug: 356007654 Test: 100-reflect2 Change-Id: Id5c5aaadcf9f8e9e59820d769ac18cb0553f81c2