Merge "Fix CTS wifi toggle test Related to bug: 31050764 am: e64a74897c" into lollipop-cts-dev