[automerger skipped] Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
am:22cbd5ca0d-s ours am skip reason: change_id I72b6db415429181395a02f163889bb1b9c0f070f with SHA191200e610dis in history Change-Id: Ic0e8518e114df09523d8975c5d9cda4706919598
This commit is contained in: