Merge changes I06c1bc14,I5415b8ed into qt-dev

* changes:
  Clean up a STOPSHIP string
  Fix view overlap in wifi dpp enrollment.

src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java

@@ -67,7 +67,7 @@ public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment impl
         QrCamera.ScannerCallback,
         WifiManager.ActionListener,
         WifiTracker.WifiListener {
-    private static final String TAG = "WifiDppQrCodeScannerFragment";
+    private static final String TAG = "WifiDppQrCodeScanner";
 
     /** Message sent to hide error message */
     private static final int MESSAGE_HIDE_ERROR_MESSAGE = 1;