Merge "Don't use a high-priority notification on auto-join." am: b1057f505a am: 3c695c1501 am: 85d0f3084e
am: 745f200a43
Change-Id: I6832e7c3c50a648a5583e36966753f7c4521431a
This commit is contained in: