Merge "Add NETWORK_SCAN permission" am: 419956210a
am: 3f7de4bc99

Change-Id: Ic69dd3d51ac2038ff5291ec6ce3bd176c66b9d31