Merge "Add startCaptivePortalApp to system API" am: 9e18198cc5 am: b01cafdb08

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

Change-Id: I7e82a2a8efb13b960b8f79b9646fcac07c7ac569