am 4c9a5fe6: Merge "Fix 5466557: Removed secondary screenlock settings labels" into ics-mr0

* commit '4c9a5fe6a3765ecd7617b611463766cd72706458':
  Fix 5466557: Removed secondary screenlock settings labels