Merge stage-aosp-master to aosp-master - DO NOT MERGE

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.networkstack"

  android:sharedUserId="android.uid.networkstack"

  android:versionCode="299900000"

  android:versionCode="290000000"

  android:versionName="2019-09"

>

    <!-- Permissions must be defined here, and not in the base manifest, as the network stack