Merge "Allow simultaneous timestamp not considered as inWindow" into tm-dev...

Merge "Allow simultaneous timestamp not considered as inWindow" into tm-dev am: 9c8f6e98 am: d2ac9bbc am: afdca0e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17748603



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