Merge "Merge "Use Wi-Fi state cache in Internet Panel" into tm-dev am: ac3033fd am: 3100649e" into tm-d1-dev-plus-aosp am: ce6ca9c6 am: bc3c2a04

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



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