Merge "Revert "Don't send new message events older than one year"" into...

Merge "Revert "Don't send new message events older than one year"" into tm-qpr-dev am: ca2c7f89 am: ac31d29f

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



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