Merge "Add CollectionUtils.indexOf" am: ef5eb5c41b

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1612297

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1e11f05f31e481a7270e502da372d4e8d204647
tree: ed5377ea24dea4992dc42f53076fb76d4c16e582
  1. staticlibs/