Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp am: e25fe58237 am: 7d7a482071

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/DownloadProvider/+/19391398

Change-Id: I7fcd1e69508972f976c7cebb8009a23746e86d38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>