Merge "Don't allow importing contacts to accounts passed in by intent unless...

Merge "Don't allow importing contacts to accounts passed in by intent unless it is valid am: c8c222bc am: 8c7f6ee2 am: 2134eeb0 am: 711cffaa am: 202cb05e am: d6b9d2c4 am: ad86f138 am: 91fd3332 am: 75a0bdc5 am: ab1ddfbb" into udc-qpr-dev-plus-aosp