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

Change-Id: I643bffc3f0eaf326b79dd7cebce2fff287396e1e