am 390a3f45: Merge "Revert behavior of Lockscreen Activity Launch to KK" into lmp-dev

* commit '390a3f459bf9ba6473f5ef93e4e37984980e1315':
  Revert behavior of Lockscreen Activity Launch to KK