Merge "logd: handle uidToName() directly"
am: caa95d551d

Change-Id: Ia863da24fb5ffa34bfec6f46ec24e15dd127e3b9