Merge "Extract out Secure Settings wrapper from InputMethodSettings" into main