Merge "Merge "Add permissions for FrameworksNetIntegrationTests" am: eb1eac5931 am: b6bf5042c1" into qt-qpr1-dev-plus-aosp am: 68c7733ebe

Change-Id: If2d58d553dacfa675638b215df4b17bd96e3b9bb