Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/tests/app/src/android/app/cts/DownloadManagerTest.java Change-Id: I16c2d14484dea54d89c3ccb105e2dfacace1f9e1