Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c am: b47d1e61 am: 3269261a am: a74871de

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

Change-Id: I7728542e6313eb578858bf1279c413a176413897