Merge "Rename InputMethodSettings#mCurrentUserId to #mUserId" into main