Merge "Don't use a high-priority notification on auto-join." am: 4658a44342
am: 3c695c1501

Change-Id: I2da85c5824c9a13c7f17a5872438dbd6490e7d58
tree: 111b76f11e7ef54a639663465f5bd290bf6e9a1e
  1. core/
  2. services/
  3. tests/