[automerger skipped] Merge "Added data retry manager and retry rules" am: 5e83ac9627 am: 7fde781861 am: 80e252f738 -s ours

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

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

Change-Id: Ie541a8b662e551edf4a4ad3ad463d85e5586d72a