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

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

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



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