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

Change-Id: I4aaa45ca3f45570b8f6f5b844e2023e4faff4122