Revert "Cherry pick: Update sl4a according to WifiScannerManager changes. https://googleplex-android-review.git.corp.google.com/#/c/576209"

This reverts commit 8a14db427cc4354936eb87c3b29266dfa9747c04.

Change-Id: I1933494babe4780045eb98ea9e246feeff173e8d
2 files changed