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

Change-Id: Ic7a8f17702b8675892f9a4f7bb8edf85a783df68