Merge "Add system API to watch for permission changes" into mnc-dev