Merge "Add CollectionUtils.indexOf" am: ef5eb5c41b am: a8cb64d658

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5064efba5f8d5c89ccd64faf04712abd80e026ca