Merge "Notification: Allow 1 hour window + fix time delta" into main am: 6958fac8

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



Change-Id: Idab46116e3a6a31bb5d6907441c91002c4ddd9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>