Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." am: 146dde2a0c

Change-Id: I091fbe2ea8cfc554838ff81ba350d7514e7c1e18