Merge "Do not use notifyAsUser or cancelAsUser"
am: 6f999ea9d2

Change-Id: Ibd183020d703ac5b78c8c72e38318df76ae4addd