Merge commit '0fc0244e808925e848ee9e350a3a213bd7574249' into eclair-plus-aosp * commit '0fc0244e808925e848ee9e350a3a213bd7574249': [Issue 2097207] Adding filtering capability to aggregation suggestions
Merge commit '0fc0244e808925e848ee9e350a3a213bd7574249' into eclair-plus-aosp * commit '0fc0244e808925e848ee9e350a3a213bd7574249': [Issue 2097207] Adding filtering capability to aggregation suggestions