Merge "Revert "Fix testDataMigrationUtils fail on R device"" into stage-aosp-master