tree c8ed1adbf9fcd9798e1c12e8a36205dabc4fa0b3
parent 4c89f808f12c6f63fe394a5ae14955f43c0b238f
parent 4ac3fffc9450cd0468e123b4e2684beb2d31ed4d
author Treehugger Robot <treehugger-gerrit@google.com> 1646847563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646847563 +0000

Merge "Unhide ApnType.ENTERPRISE" am: 4ac3fffc94

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

Change-Id: I8a38f7bd32831e5bdc829c61db923527238cd9cd