Merge "Mainline: remove usage of hidden DEFAULT_PHONE_INDEX"