Merge "Add NETWORK_SCAN permission"
am: 419956210a

Change-Id: Ia9fe0ff68145e1a6bbb5bd903012e1ecb57a3d0b