Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev