Merge "Track permission changes in frameworks/base" am: 4e6d6174bd am: f228b8b69e

Change-Id: I9763e2ccc37140e9cf96b21d2877d95d35680bcc