Merge "Revert "Revert "Move Gallery2 to androidx.""" into pi-dev

LOCAL_MODULE_TAGS := optional

LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-fragment \

    android-support-core-ui \

    android-support-compat \

    android-support-v13

    androidx.fragment_fragment \

    androidx.legacy_legacy-support-core-ui \

    androidx.core_core \

    androidx.legacy_legacy-support-v13

LOCAL_STATIC_JAVA_LIBRARIES := \

    com.android.gallery3d.common2 \

        android:choiceMode="multipleChoiceModal"

        android:stretchMode="columnWidth"  />

    <android.support.v4.view.ViewPager

    <androidx.viewpager.widget.ViewPager

        android:id="@+id/ingest_view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

import android.net.Uri;

import android.os.Bundle;

import android.os.IBinder;

import android.support.v4.print.PrintHelper;

import androidx.print.PrintHelper;

import android.view.Menu;

import android.view.MenuItem;

import android.view.Window;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.IBinder;

import android.support.v4.app.DialogFragment;

import android.support.v4.app.Fragment;

import android.support.v4.app.FragmentActivity;

import android.support.v4.app.FragmentTransaction;

import android.support.v4.print.PrintHelper;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentTransaction;

import androidx.print.PrintHelper;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

import android.app.Activity;

import android.graphics.Rect;

import android.os.Bundle;

import android.support.v4.app.Fragment;

import androidx.fragment.app.Fragment;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;