Merge "Add indexOf method" am: 2318c7f334

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bd6108ca913d493dc70bd4c2eb986077e6d6606