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

Change-Id: I93b3600aa3e2688294bd349107970f47bdd90b39