am 1d6279ee: am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"

* commit '1d6279ee3d0771687a56a22e70dc1e7aa5ac3078':