[automerger skipped] Merge "Fix NPE in LinkBandwidthEstimator" am: 392e8a37...

[automerger skipped] Merge "Fix NPE in LinkBandwidthEstimator" am: 392e8a37 am: bec1bd88 am: 9a234498 -s ours

am skip reason: Merged-In Ib4f37db0cd5a5ca83e8fea10a8e76d902d1065d4 with SHA-1 ed05066b is already in history

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



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