Merge "Merge "Support new regulatory label for location" into qt-dev am:...
Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee am: 920f6109" into qt-r1-dev-plus-aosp
am: 6a014082
Change-Id: I000e21b64c9d220e00440ffdb6dcaa3217c814bc