Merge "NullPointerException when running monkey test in IccLockSettings"