Merge "Pass in calling UID and package to dumpstate"
am: bc6e433ae4

Change-Id: I1bf6f1053d088af55d35164207e5167c806db686