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

Change-Id: I8cc72757184bcfd354e0aaf7a96b4842fa131663