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: 24d18cea4476030bc7abba256bcb21927fd22870
  1. client-libs/
  2. common/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING