Merge "Don't use a high-priority notification on auto-join." am: 49c91d93c9
am: 3c695c1501

Change-Id: I2da85c5824c9a13c7f17a5872438dbd6490e7d58