Merge "Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am:...

Merge "Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a2923 am: c6f7cf99" into sc-v2-dev-plus-aosp am: fcaf1b54

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I8d13260d07db21cd3b8c9555a3e53f9865e43d4e