Merge "InProcessNetworkStack requires platform-signed APK"