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

Change-Id: I553d4504ffca78374fe55900a934f73b88aa1f01