Merge "Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d am: 920f6109a8" into qt-r1-dev-plus-aosp