tree 595e3d8eb5265d331cb6b4acff3ff741c66de8da
parent ec7bc4e13f6e3ff15ba86d46b72f328fbd9f42a1
parent af1f67ebd4ce390cdbf1185dd8805e50358a46fd
author Joshua Duong <joshuaduong@google.com> 1593479379 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593479379 +0000

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

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

Change-Id: I56de8c996bccc8c926547afdc322c36d381f557b