Merge "Add a unittest to cover the retry of load escrow data" am: b13ad07770

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I649a0d2d392078c4f0c515c68e8998b2d0bebf22