am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev

* commit '22cbf54ca0c64344cd28590446a02e521ca914f7':
  Conditionally allow non-primay profiles to use TextServices