Merge "Don't use a high-priority notification on auto-join." am: 4658a44342 am: 3c695c1501
am: 89982edb36
Change-Id: I4d1d47a536e93403b5817acecbcdc54045e6cc38
This commit is contained in: