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

Change-Id: I8f5998ee5cf6c91450038851efe8e8e4d48c46c9