Merge "Atoms for logging permission grants during system upgrade." into qt-dev am: 58c51d17d1
am: ec9cbdb220

Change-Id: I51325b66d39f5888fade65ce07587256b6857c08