Merge "Fix wrong position of cursor in IccLockSettings" am: 3a3044eeef am: 92e77cbd43 am: ecf2bdb46f
am: cca755cfac

Change-Id: Ibe3700977ed96afe09e0b15ceecf125edeb6d23b