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

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

Change-Id: I8c5a5cf5902447c0653adfb4cdf141cd9b523f1d