Merge "Added data retry manager and retry rules" am: 5e83ac9627 am: 7fde781861

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

Change-Id: I093f4dc0892a81fa743eb112c02d9e87e9f347d9