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

Change-Id: I2dd392bf176d795f26a4b497971a177d96746a63