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

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

Change-Id: I43f3d2fdd32b5b8bbf726a6e20c36a09eb2e71ec