Support dangerous permission for Android M

Change-Id: I4e2b7dbc229afa52e9693630f95b9f4954f2def0

Conflicts:
	AndroidManifest.xml.jinja2
3 files changed