Updating sample to use Android M permissions model.

Tested on L and M releases.

Change-Id: I35e3f589ce20ff4ff42aa73972d6c2017ebd8b5d
6 files changed