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

This reverts commit 310cdc8a347dd2a2970da95369a5af4051353ab6.

Change-Id: Ib8af9ec4f2c7f8fb9b5c86df6f6a07c642d5d25c
2 files changed