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: 91bbb3b0 am: 4e7b5e62 am: 9a23d316

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



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