am e882cea6: Merge "Fix issue #17082301: replacePreferredActivity is ignoring userId" into lmp-dev

* commit 'e882cea6d6f92efd68191f1f74fd27fb9e1d9016':
  Fix issue #17082301: replacePreferredActivity is ignoring userId