Merge "Add indexOf method" am: 2318c7f334 am: 334a56ba7d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic11b3b29d1322de38efd36fe1f925c794eb34a30
tree: 53426c3c5ac7f68fed22c7722ca2fac06684e5e8
  1. staticlibs/