Merge "Fix NPE due to a null package name of system enforcing admin." into main