Merge "Scroll to find hidden DownloadService notification" am: 089913eb89

Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/1419094

Change-Id: I1f1f08dc18db32929a3f4caeb4a802b0821892c1