Merge "Just a little 'ol activity manager permission change." into honeycomb