Merge changes from topic "caitlinshk-wifi-flag" into udc-qpr-dev am: 9a06bac5 am: afcf2f88

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



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