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

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

Change-Id: I938c0abdf21c197f19f7b89cf8388a86827d615e