tree 5edf7c26b7ee02bff2942e8513df610f017e47d6
parent e427dd865cab6ee62246dce235fde6b1a3732431
parent ccbccf10995b9f5d0ecf343549b3f7d663ed4ca0
author Junyu Lai <junyulai@google.com> 1643324077 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643324077 +0000

Merge "[DU12]Remove NetworkType Annotation" am: 7da58cca81 am: 5a4f6f806f am: c96293258a am: ccbccf1099

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1963221

Change-Id: I25de40b8818edfdfc1b55b4b6fcb9ecf0de37d00