Merge "Track permission changes in frameworks/base"