Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446

Change-Id: I612c709e9dad8b75e91f07e6eab44cff28fd1404