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

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

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

Change-Id: I08482c34712394ddbc8e271ae199166b482ec579