Merge "Hide Default apps and App permissions under Advanced." into pi-dev
am: 36800c5115

Change-Id: I15bba4d3ae39d5aca176890624048bbe14a1c59f