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

Change-Id: I8031a5771698712bd547f4379c31d9c616500075