Merge "Fix NPE for devices that don't use a lock icon in sysui." into qt-dev am: 6490c31b4c
am: 9b8f834e48

Change-Id: I23f880c9f2b7eb666f3c146ca595c2438a8211e1