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

Change-Id: Ib3c0330b3a24503b42ccbd14e707d5e2babe27c0