Merge "Ringtone picker dialog should use appcompat v7 AlertDialog" into ub-deskclock-escargatoire

package com.android.deskclock;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.content.Context;

import android.net.Uri;

import android.os.Bundle;

import android.support.annotation.NonNull;

import android.support.v7.app.AlertDialog;

import com.android.deskclock.data.DataModel;