[automerger skipped] Merge Android U (ab/10368041) am: 97bad90ab4 -s ours am: 2c6c77f879 -s ours am: d52f464f97 -s ours

am skip reason: Merged-In I334c003ca53cdf7d9be88f36721a7116afd7b37a with SHA-1 9058c22d3f is already in history

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

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