Merge "Adjust the RAT preference when SIM is PIN locked" into 24D1-dev