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