Android Mainline 12.0.0 Release 59 (7993649,com.google.android.captiveportallogin)
Merge "Add dependency to legacykeystore." into sc-dev am: 0668272485

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/14983027

Change-Id: Ie983ecb01b50d3199b3e0ebe054694cacb62837b