Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev