Merge "Make allowBackup of MediaProvider false"
am: da828d4baf

Change-Id: I32315243f8c307e1754758310a38c8710db7997a