Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 96f705dbeb

Change-Id: I2584b86082f224c6fdaa7e4ecc0aac52a92c3427