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

Change-Id: I8926d4a4ff382a814244cfbf540834b8a2a25a67