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

Change-Id: I515d68efb0393e71165212eef934c1534330efde