[automerger skipped] Merge "Honor retry timer from setup data call response...

[automerger skipped] Merge "Honor retry timer from setup data call response for emergency request" into udc-qpr-dev am: 206dc300 -s ours

am skip reason: Merged-In I4a058108bc255d538f2e5e2dc38d3681046ef6ca with SHA-1 fabb8329 is already in history

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



Change-Id: I363ca79b5042a0fffb1fb2aef007e1d8f4344c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>