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