[automerger skipped] Merge "Reduce expected network usage of RemoteProvisioner" am: 56104623e1 am: 3e31ec2a60 -s ours am: cc1951e1c7 -s ours

am skip reason: Merged-In I8884d2aa59e9fe38ee84127a45bd971d4355580a with SHA-1 0612d9f291 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/1790467

Change-Id: I7a8b66b7d695599d629c125e968b6d565fc3b3d6