Merge "Exclude non-permission entries from getAllPermissions()" into pi-dev
am: b4ef260f42

Change-Id: Icbd9fe3b2c2a51e38f26569a741d67aab76fd1be