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

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



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