Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c am: af1f67eb am: a9a54cd0 am: 96283a34

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

Change-Id: Id163e983675390a842c3aa1dca3691d41071be96