[automerger skipped] Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev am: b71d950932
am: e840014762  -s ours

Change-Id: I6fc755e991b74bb3b3b1dd05b2235339fb3bfe37