Merge "Add Default grant for Captive Portal Login app" into tm-dev am:...

Merge "Add Default grant for Captive Portal Login app" into tm-dev am: 5f951629 am: 6e1a8a09 am: f5c48984

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



Change-Id: I5bd8955e120a52644e7a668e378356271011653c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>