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

Change-Id: I42c712c21c545c61300c7e740b4851e33a029cad