Merge "Snap for 8755081 from 7dc731276bdfda892f93e86b2fdeac6562dc99c6 to androidx-sharetarget-release" into androidx-sharetarget-release