Merge "Avoid duplicate test names in CtsLibcoreJavaUtilCollectionsTestCases" into oc-dev
am: deb9344eb5

Change-Id: I59d2496e3003341d495064ab566b3dc50493b04c