Merge "Reset common association source while resetting procstats associations"...

Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e216 am: 3154bb65 am: 84a074db

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

Change-Id: I108d585c792dbcca5094f2d432c66fab1b07c473