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
am: 7c5277bc27

Change-Id: Ic77c82377225d6b50725665f661f0bfe4affbd19