[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: d56a3c74 -s ours

am skip reason: skipped by user jackyu

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

Change-Id: Ia02a70efef5345941d7cd0fb4d2ca0da015adf2a