Merge "Replace broken UserHandle.SYSTEM check in LPU"