Merge "Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c7 am: 8563bf16" into qt-r1-dev-plus-aosp