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

Change-Id: I08ef81105030ad4abb0627a4e2fc831fc7853896