[automerger skipped] Merge "This contains a squash of two changes >>>>>>>>>>>>>>>>>>>>>> aosp/1284588 Adjust permission of NetworkProvider related API" into rvc-dev am: 78ab633b8f am: a01c48d651 -s ours

am skip reason: Change-Id Ic9809e731aa811a51c2f82d189372169d99a5ed9 with SHA-1 ebbfd3ccb9 is in history

Change-Id: I00a29862733b57decf62241abdc7582cacd156e6
This commit is contained in:
Aaron Huang
2020-04-17 11:17:00 +00:00
committed by Automerger Merge Worker

Diff Content Not Available