Merge "Fix 5117544: Fix crash in KeyguardStatusViewManager when resId==0"