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

Change-Id: I90a927891a207971c86b8abebc8cc9c5457a5f2e