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

* commit '2c0c52962796feb589e37dba948ba28aae992b01':
  Connect to activity manager as root.

Change-Id: Ic76dda3a7086d33262d51379a70b31b5846d9cdd