Code dump with latest updates. am: f8fef1787d

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

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