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

Change-Id: I6832e7c3c50a648a5583e36966753f7c4521431a