Merge "Only log restorecon changes for existing dirs." am: ee080ea229 am: ed8915cc2c am: 4500fde965
am: 1e6f01483a

Change-Id: I11a036ab1c2e6d7e854474205da8fced743d4cb1