Merge "Add option to make sign-in notification ongoing" am: ea395bf6a0

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

Change-Id: I61e852037ee8f38ebe89eab21e82df9a7b7c5810