Merge "Increase testReadWriteProgram() timeout to 15 minutes" into main am: b26b437dea

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

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