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

Merge "Reset common association source while resetting procstats associations" into sc-dev am: dec2e216 am: a969b77e am: 9c2904f3

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

Change-Id: I87da5f54fa21ff5fe7d0521b13a0e8a06ea56306