Merge "Merge "DO NOT MERGE Allow the USE_OPEN_WIFI_PACKAGE to access WifiInfo unfiltered." into oc-mr1-dev am: db68688e4e" into oc-mr1-dev-plus-aosp
am: 0688143aaa  -s ours

Change-Id: Ic31032df63d03e17f96401aa775df6f88105b4d0