Merge "Sleep 1s before force stop and use killBackgroundApp" am: 2417859fa5
am: 96cb6d97e1

Change-Id: I68ca87aa73978065c5093bc318fe43cb646562b2