Code dump with latest updates. am: f8fef1787d am: 9058c22d3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/22462863

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