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

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

Change-Id: I43ede806a0f746ba579629d4734eb04f8cde83c4