Merge "Increase max metrics duration deviation to 2 hours" into main am: 84cc4e507e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2939460

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