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

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

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