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

Change-Id: I2f83d5b9be32f2bec97d062fc155ae338d2a5c44