Merge "DO NOT MERGE Make stop complete notification call in to ActivityManager blocking." into pi-dev
am: b71d950932

Change-Id: Ifae20ab099be12674e643c1b6331ec689c286f28