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

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

Change-Id: Ia7035d953fe0f073467b608b58aa06f65a313224