tree 004174a81acfcaf72d146a38769048e990d3a8d9
parent cdbc51fa521645dbd90f4d62ccbfcf5f851eced7
parent dfbd3a4072446a74662f32e6b53bdfa615348f33
author SongFerng Wang <songferngwang@google.com> 1615295244 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615295244 +0000

Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: dfbd3a4072

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd2061cb4d29d9b129e91a68c4e6c20fdea9c5c7