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

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

Change-Id: Ifeaf05916106b37933c411b5bc1155a86a88ce18