Merge "[pm] pass the correct userId to uninstall metrics"