[automerger skipped] Merge "Added data retry manager and retry rules" am:...

[automerger skipped] Merge "Added data retry manager and retry rules" am: 5e83ac96 am: 7fde7818 am: 80e252f7 -s ours am: 8ec569f6 -s ours

am skip reason: Merged-In I51f6ab1851aaadae52845cc1c5a18703976050b6 with SHA-1 07844fbd is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2001350

Change-Id: Ida87e0ccd075e3729a49bdc7d8a5d63638e8ac4b