Merge "Do not use notifyAsUser or cancelAsUser" am: c80e16f6fd am: 3e24a0c90c
am: d77ea674c0

Change-Id: I51aa1ad7b386913984050f9106f2557c29e20806