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: d0da6a26 am: fa680b71

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

Change-Id: I1c930cc29b67d0136f0c87ace8685a5b9b070547