am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev

* commit '8320cf2de357265179c3007256394b0cbb69d949':
  Fix wrong intent being passed in PhoneWindowManager.