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

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



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