Merge "Fix CTS test failed on R device" am: afa18f0256

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If786db7b5635bcd4bb41043169e1c187b13d0eee