Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 239c23c9dc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49