Merge "Allow phone UID to export singleton providers" into lmp-dev