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

Change-Id: I6b0eb7e706eee65c868fb2cfe1c84189bf8f8432