Merge "Increase the wait timeout for meteredness to change." am: edb6669cf1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9908365b2393fd718bd1a5cda4d6839bc96eb869