Merge "Only log restorecon changes for existing dirs." am: ee080ea229
am: ed8915cc2c

Change-Id: I3895295399a51b93ad5dea76d8d346591d6ca178