Merge "Revert "Do not use notifyAsUser or cancelAsUser"" am: 1af7a6e819
am: aa57fdac24

Change-Id: I633840e13f35ff3a716a17efbc779f6cfe9fd1f1