Merge "NFC: Clean duplicated and unknown permissions"
am: 076005aea2

Change-Id: I6a1cf07139f3b234d47be09c0c7773fb710c60ed