Fixes
hide search assistant arrow from lockscreen when custom lockscreen is enabled

Change-Id: I02d8286dd9f07cdb1de8a61101e772be35f65fda
SystemUI: Don't try to translate SIM slot numbers

Change-Id: I9cbf8a04e04e363e11465516da7c7f1336c5c10a