Merge "[pm] clarify the javadoc for getArchivedAppIcon" into main