Revert "ril: Remove redundant check in message interception"

This reverts commit 19a3ad7294de7d024bfa9fda738e2ea73f1ea4fe.
Revert "Make wpa_supplicant oneshot."

This reverts commit 4eff332e2b814a2f40e390d1cc6bfdccf2556b69.

Change-Id: I68c074363024f9042865aa850ee8c675e6cb5b78