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