Merge "Add Collectors.mapping tests." am: 2fd13c58b5

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1731330

Change-Id: I527330dba6088eb6f14983e7e612e3794896fcbc