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

Change-Id: Ibe9a8f6f359dfa1a5243c5ccc9dd791dd946fc07