[automerger skipped] Merge "Add prioritize_bandwidth and prioritize_latency"...

[automerger skipped] Merge "Add prioritize_bandwidth and prioritize_latency" am: 3d0cd865 am: 5f819b99 am: 5983032a -s ours am: 169d8fec -s ours

am skip reason: Merged-In I9383ba791c04ba2a974e2acfd567fac18b1b3f84 with SHA-1 20bdbed7 is already in history

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

Change-Id: I52a0e16893ceda19f148bf828b38fdcdd5676d30