[automerger skipped] Merge changes from topics "data_retry", "setup_data" am:...

[automerger skipped] Merge changes from topics "data_retry", "setup_data" am: 29c90eff -s ours am: 9761a09e -s ours

am skip reason: skipped by user jackyu

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

Change-Id: I1d771e2dcd31ff9422b71f6f9c6a148006b226e5