Merge "Add CollectionUtils.contains for short" am: 35570f4599

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

Change-Id: Ib6e05a150e1d72b6c740520c6100935905f8769a
tree: 17e346db0639b17b8a84fa3d23f49432ae2894a9
  1. staticlibs/