[automerger skipped] Merge "Remoe usage of CollectionUtils as it's not exposed...

[automerger skipped] Merge "Remoe usage of CollectionUtils as it's not exposed to mainline modules." am: 146dde2a am: 37de3bd1 am: 1c0b7dee -s ours
am skip reason: Change-Id I5f56747be8bc4702e58b7fe27c21f7959bdd76de with SHA-1 55e95900 is in history

Change-Id: I5c8c7e7aeb838172a6c8410dc2c7fc762f3f4670