Merge "Add permission protections in sample apps"
am: 1859e14079

Change-Id: I9c80b86a089c441ec664d9f7693604a216918972