Merge changes from topic "caitlinshk-wifi-logging-split" into tm-qpr-dev am: 3800ea7c

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



Change-Id: I3b97cc0259cb39a3ebafd3cc7933198bbe208c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>