Merge "Add package, activity count in allow list for ContentCapture logging" into tm-dev