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

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

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

Change-Id: I9fb82825c21d020b23bb2f8d8ff42d8b64336bd9