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

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



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