Merge changes I06c1bc14,I5415b8ed into qt-dev

            <FrameLayout

                android:layout_width="wrap_content"

                android:layout_height="wrap_content">

                android:layout_height="wrap_content"

                android:clipChildren="true">

                <TextureView

                    android:id="@+id/preview_view"

                    android:layout_width="match_parent"

    <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->

    <string name="default_phone_title">Phone app</string>

    <!--

     ~ STOPSHIP(b/110557011): Remove once the new UI is ready.

     -->

    <!-- Title for Roles settings [CHAR LIMIT=30] -->

    <string name="roles_title">Roles</string>

    <!-- Label of default app for current setting [CHAR LIMIT=40] -->

    <string name="default_app">(Default)</string>

        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;