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

Change-Id: I95d4e2d7f451ad7284eb2ee429f3037e2f2ff659