Merge "Support aggregation over association sources per process" into sc-dev am: 72eee56f am: 7991d6ad am: c4c2d789

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

Change-Id: Ieee62905466137480aa435557e73baa869913a6b