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

Change-Id: I54863e43ec62700dec408e728b628319e74f1a00
2 files changed