Merge "Updating timeout for Per-App CTS" am: 420072651d

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

Change-Id: I53a0510dd4008be8cb68daf6c65f816b8d0f68a2