[automerger skipped] Fix for the errorprone build. am: a285bc4c6d am: 1699cc9757 am: b36c26a847 am: 99360175a2 -s ours

am skip reason: Merged-In I7bce7c6965db91a32c3e46456be2ad4210935a63 with SHA-1 383a6204bd is already in history

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

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