Merge "Merge "Emergency location notification text must be in the correct language" into qt-dev am: 1c60a7c773 am: 1a70c5a89f" into qt-r1-dev-plus-aosp