Merge "Deprecate android.util.Mutable*." am: 71a9e66d4a
am: 708034e951

Change-Id: I903140fbb0a3635d7502943274377f99529b52a7