Merge "Connect to activity manager as root." am: d61bfb9 am: 2c0c529
am: c25bd56

* commit 'c25bd561ae4cfb0e517501f17ffad2158cdc8631':
  Connect to activity manager as root.

Change-Id: Ia0dffa2ea1f7c1c33eea7d4a7b81bbd8f740a11e