Fix up concurrent su request handling

Change-Id: Ibf1e977f869831a2235022b9096aa6c8c1d52dc9

Conflicts:
	AndroidManifest.xml