Merge "Clear pending activity launches when force stop package"
am: 00b678dd2d

Change-Id: Icd953ce6aff52a657e960d84799db7e4ca079688