Merge "Add collector library in multi user per test apk." into rvc-dev am: 3ed037cb am: 3a0edac2 am: a2f6a4cd am: ab4806ee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886051

Change-Id: Ifa0a7e101eaa705417feccb484b6fbb84c763cee