am 24d04eeb: Merge "Don\'t clobber intent flags when starting recent activities anew. (Bug 16327074)" into lmp-dev

* commit '24d04eebfe00e0d8346c2864d84f04b4d046b9e1':
  Don't clobber intent flags when starting recent activities anew. (Bug 16327074)