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

Change-Id: I4d1d47a536e93403b5817acecbcdc54045e6cc38