Merge "Use device policy suggestions when choosing alias"