Merge changes Ia52b556f,I83844835 into main

* changes:
  Remove getCurrentInputMethodSubtypeForNonCurrentUsers()
  Make IMMS#getCurrentInputMethodSubtypeLocked() multi-user aware