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

Change-Id: I6ea72408e136709962609d49102d2852aa48ffd4