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

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

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